Currently, we mark an IO request to STATE_IOREQ_READY state before

calling IO handlers in xen HV, i.e. vmx_portio_intercept or
vmx_mmio_intercept.  Actually, STATE_IOREQ_READY means it's ready for
DM handling, only if IO handlers in xen HV won't handle it, it should
be passed to DM. This patch fixes this issue.

Signed-off-by: Yunhong Jiang <yunhong.jiang@intel.com>
Signed-off-by: Xin Li <xin.b.li@intel.com>
Signed-off-by: Nakajima Jun <nakajima.jun@intel.com>

diff --git a/xen/arch/x86/vmx.c b/xen/arch/x86/vmx.c
index dd5a6b87e6782d348d1846038be82166fd8d88c2..c403002befec3f468f70a6870b0cee3d748d726c 100644 (file)
--- a/xen/arch/x86/vmx.c
+++ b/xen/arch/x86/vmx.c
@@ -646,14 +646,14 @@ void send_pio_req(struct cpu_user_regs *regs, unsigned long port,
     } else
         p->u.data = value;
 
-    p->state = STATE_IOREQ_READY;
-
     if (vmx_portio_intercept(p)) {
         /* no blocking & no evtchn notification */
         clear_bit(ARCH_VMX_IO_WAIT, &v->arch.arch_vmx.flags);
         return;
     }
 
+    p->state = STATE_IOREQ_READY;
+
     evtchn_send(iopacket_port(v->domain));
     vmx_wait_io();
 }

diff --git a/xen/arch/x86/vmx_platform.c b/xen/arch/x86/vmx_platform.c
index cef786b14a86a55777a110880c590b20f56bee9a..cd1a5b3b025e18e27369301bbe629f2817787d8c 100644 (file)
--- a/xen/arch/x86/vmx_platform.c
+++ b/xen/arch/x86/vmx_platform.c
@@ -643,14 +643,14 @@ void send_mmio_req(unsigned char type, unsigned long gpa,
     } else
         p->u.data = value;
 
-    p->state = STATE_IOREQ_READY;
-
     if (vmx_mmio_intercept(p)){
         p->state = STATE_IORESP_READY;
         vmx_io_assist(v);
         return;
     }
 
+    p->state = STATE_IOREQ_READY;
+
     evtchn_send(iopacket_port(v->domain));
     vmx_wait_io();
 }